Merge "Fix warnings in all snaps-related modules"