Some more fixes for pvw