sm: more syntax fixes