MULE-7755: Minor fixes.