even more syntax fixes