fixed issues with the App class which appeared due to bad commit before branching