Minor fixes and small enhancements

Here are some minor changes I made to get the server running standalone.