More small W2 fixes