Add extra asserts on "w"