Small changes in main application