changes to fit CI environment