Fix misc. syntax issues.