Unite -> ag tweaks