More #controls fixes