Temp fixes to get the app running