Minor controls fixes.