More braces fixes