More fixes on motor issues