Misc fixes, 2