more WR bug fixes