Merge "Minor controls fixes"