Fixed CGL issues regarding braces