Fix some bugs with Thomas controls