Fixes for server publish

This should now work with server setup