Some fixes with ENZM and RADN