Syntax and var fixes