Yet more syntax fixes