Minor fixes to base app