Fixing control issues