More Fixes with Start/Stop Wheels