Fixing syntax errors and missing service definitions.