Include Downstream Cleanups

Merge in fixes from @jamesward.