Two more fixes to Swagger schemas