Update some things in the master so I can deploy this correctly again