temporary hacks to get server to work