Fixing syntax errors, some caused by git and some by humans