Fixes to make the drivetrain work