TASK 10: final fixes to support app.xml