fix CI build issues