Include Downstream Changes

Improvements from maintainer.