Server Issue Fixes