Fix all the things

This should all work in production now