Syntax fixes
Merge pull request #411 from Zentyal/scabrero/syntax-fixes

Syntax fixes