Convert more of Stage
Misc fixes and cleanups