Bracket matching tweaks