CRM-12622 - Misc fixes/enhancements