Fixes for server crashes. Blah.