Fixes for server