Fixed various issues observed when starting up the server