Attempted server side bug fixes
Remove comment