Fix some control issues