Fixes to motors