minor bom/dnp tweaks