Still more syntax fixes