Fixed some controls