More Orbit bug fixes