A couple of fixes to get the app running production