Reduce differences to upstream
Fixes