more fixups for brightbox