fixing some issues with server side stuff