small nmml fixes