Fixes for server status