Minor changes to get the application running