Make things work better on CI

/cc @themitchy @Qard @sam-github