Fix more syntax problems