Syntax consistency corrections