Variable and semicolon fixes