more syntax fixes