Revert "Server changes"

This reverts commit c8f965d0a10fad0f11a9434f9fd2cba71818bd47.
Revert "Revert "Server changes""

This reverts commit 423f7f2485f8497cf7180bf8a90d770126c4492c.
Fixes