Fixed up some bug detecting feature of waviate