Fixed the remaining syntax errors