Next Gear bugfixes