1.8/1.13 compatibility

A few adjustments so the integration tests run through in 1.8/1.13.