Fixes for NM/kg