Brightbox fixes