Final fixes for Orbit and Orbit Point models