Hawker update and WR bug fix