OpenAPI fixes