Base Gearbox fixes