Crm 13973 qa fixes

Fix for defects mentioned in : http://issues.civicrm.org/jira/browse/CRM-13973?focusedCommentId=58122#comment-58122 and http://issues.civicrm.org/jira/browse/CRM-13973?focusedCommentId=58222#comment-58222