MESS/UME fixes