fix remaining lwt tags