Follow up to fix some issues - TRUNK-3822