Fix up status and location schemas