Attempt to fix CI errors