Fix remaining syntax errors