some fixes to make the application run