Fix some of the bootstrap conflicts.
Start of new Ride controller