Fix a couple weird things for production api