misc. minor tweaks for recent cisco formats