Bunch of fixes to get production working