advisor and advisor admin tweaks