Tiny tweaks all over the place to improve server compatibility