Changes according to Mule code review 12/11/2013