Misc fixes I noticed last night