Some more changes to Server Console and Admin server handling.