Correct Swagger format... and actually correct API defs too