Updated Fixes to server