Minor fixes from APPS-232