fixes to get server to work