Fixes compatibility issues with server
Fix compatibility issues with server part