Correct some (mostly) syntax errors