fixes and server