Fixes to Nato gear