controls fixes