Brig Fixes Clean

Made compliant with the latest master>dev merge