Small fixes to things that the server had problems with.