More controls fixes