Tweak settings for CI; fix