Make things work better on CI

/cc @sam-github