Fix small issues with ride_window.

Fixes remaining issues with ride_window. This time the pull request is to the correct branch!