Fix s_server version specific methods