Small corrections to Gear assignment