Small improvements to make easier to start application.