Bug fixes
Server clean up