Cleanup syntax errors