fixes to natmon