Fix some API operationst