Tweaks to accomodate AdminBarMod