Fix syntax errors
Fix more syntax errors