Fixed some control-related bugs