Couple of minor fixes to apps.base