Various fixes for the app to work on Peak.