CRM-12923 - Misc quick fixes (following NB QA)