emi - noon fixes