Misc other fixes