BREN-6 Fixes after QA