[BUGFIX] Syntax fixes