Additional role fallback and multisite fix