Implemented several changes to support the latest Weaver build.

All 569u, 267/330i tests pass.