Minor fixes to get the server up