Minor tweaks, admin tagging is broken v3.1.0