Repro cleanup, fix of W3 validation errors