Fixed some control stuff