Fix a few riding errors