Fix REST server methods