Fix some of the issues in App. E found by Fred