Fix some more sexp with location info