wv2: update and fix