Wip/wv fixes

IGNORE THIS REQUEST. GIT AUTO PULL REQUEST DOES IT WRONG