Some more syntax fixes