Syntax errors fix