Crm 13964 QA fixes

QA fixes for http://issues.civicrm.org/jira/browse/CRM-13964 #comment-56923, #comment-57306, #comment-57610