Fixes from merge to get the app in a running state before testing.