Misc fixes Saturday