Quick fixes to the application