Misc fixes and tweaks