BrBundle fixes