Misc fixes to ensure still compiles