Fix bugs 43617 and 43440 at http://bugs.sugarcrm.com