Fixes for the server