Misc 0.16 fixes and tweaks