Handle api.staging, fix specs