diff --git a/.github/workflows/master.yaml b/.github/workflows/main.yaml
similarity index 95%
rename from .github/workflows/master.yaml
rename to .github/workflows/main.yaml
index 034e37936..d916436ff 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/main.yaml
@@ -1,8 +1,8 @@
-name: master
+name: main
 on:
   push:
     branches:
-      - master
+      - main
   schedule:
     - cron: '0 0 * * 0' # 00:00 Sunday
 
diff --git a/Cargo.toml b/Cargo.toml
index ac07a38df..8d7aa2c2e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,12 +71,12 @@ libm = [
 ]
 
 rand = [
-  "num-bigint/rand",
+  "num-bigint?/rand",
   "num-complex/rand",
 ]
 
 serde = [
-  "num-bigint/serde",
+  "num-bigint?/serde",
   "num-complex/serde",
   "num-rational/serde",
 ]
diff --git a/README.md b/README.md
index f9ab46cfc..e97b4500d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![crate](https://img.shields.io/crates/v/num.svg)](https://crates.io/crates/num)
 [![documentation](https://docs.rs/num/badge.svg)](https://docs.rs/num)
 [![minimum rustc 1.60](https://img.shields.io/badge/rustc-1.60+-red.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
-[![build status](https://github.com/rust-num/num/workflows/master/badge.svg)](https://github.com/rust-num/num/actions)
+[![build status](https://github.com/rust-num/num/actions/workflows/main.yaml/badge.svg)](https://github.com/rust-num/num/actions/workflows/main.yaml)
 
 A collection of numeric types and traits for Rust.
 
diff --git a/RELEASES.md b/RELEASES.md
index 4fcb1a45a..8f1aeb689 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -66,12 +66,12 @@ dependencies in your own crates, it is not a breaking change to move to `num`
 A few common changes are listed below, but most of the development happens in
 the individual sub-crates.  Please consult their release notes for more details
 about recent changes:
-[`num-bigint`](https://github.com/rust-num/num-bigint/blob/master/RELEASES.md),
-[`num-complex`](https://github.com/rust-num/num-complex/blob/master/RELEASES.md),
-[`num-integer`](https://github.com/rust-num/num-integer/blob/master/RELEASES.md),
-[`num-iter`](https://github.com/rust-num/num-iter/blob/master/RELEASES.md),
-[`num-rational`](https://github.com/rust-num/num-rational/blob/master/RELEASES.md),
-and [`num-traits`](https://github.com/rust-num/num-traits/blob/master/RELEASES.md).
+[`num-bigint`](https://github.com/rust-num/num-bigint/blob/HEAD/RELEASES.md),
+[`num-complex`](https://github.com/rust-num/num-complex/blob/HEAD/RELEASES.md),
+[`num-integer`](https://github.com/rust-num/num-integer/blob/HEAD/RELEASES.md),
+[`num-iter`](https://github.com/rust-num/num-iter/blob/HEAD/RELEASES.md),
+[`num-rational`](https://github.com/rust-num/num-rational/blob/HEAD/RELEASES.md),
+and [`num-traits`](https://github.com/rust-num/num-traits/blob/HEAD/RELEASES.md).
 
 ### Enhancements
 
diff --git a/ci/test_full.sh b/ci/test_full.sh
index 6a361e07f..9442deb58 100755
--- a/ci/test_full.sh
+++ b/ci/test_full.sh
@@ -21,6 +21,14 @@ check_version() {
   ]]
 }
 
+export CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS=fallback
+generate_lockfile() {
+  cargo generate-lockfile
+  if ! check_version 1.85 ; then
+    cargo +stable update
+  fi
+}
+
 echo "Testing $CRATE on rustc $RUST_VERSION"
 if ! check_version $MSRV ; then
   echo "The minimum for $CRATE is rustc $MSRV"
@@ -34,7 +42,7 @@ echo "Testing supported features: ${STD_FEATURES[*]}"
 echo "  alloc supported features: ${ALLOC_FEATURES[*]}"
 echo " no_std supported features: ${NO_STD_FEATURES[*]}"
 
-cargo generate-lockfile
+generate_lockfile
 
 set -x