Misc fixes, etc