diff --git a/Cargo.lock b/Cargo.lock
index 58d27f27..55968257 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -687,19 +687,6 @@ dependencies = [
  "subtle 2.2.3",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
-dependencies = [
- "byteorder",
- "digest 0.8.1",
- "rand_core",
- "subtle 2.2.3",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "2.1.0"
@@ -714,6 +701,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
+dependencies = [
+ "byteorder",
+ "digest 0.8.1",
+ "rand_core",
+ "subtle 2.2.3",
+ "zeroize",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.0.0"
@@ -3322,7 +3322,7 @@ dependencies = [
 
 [[package]]
 name = "spl-feature-proposal"
-version = "1.0.0-pre1"
+version = "1.0.0-pre2"
 dependencies = [
  "borsh",
  "borsh-derive",
diff --git a/associated-token-account/program/src/entrypoint.rs b/associated-token-account/program/src/entrypoint.rs
index 7cf225a1..82641a41 100644
--- a/associated-token-account/program/src/entrypoint.rs
+++ b/associated-token-account/program/src/entrypoint.rs
@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(not(feature = "no-entrypoint"))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
diff --git a/examples/rust/cross-program-invocation/src/entrypoint.rs b/examples/rust/cross-program-invocation/src/entrypoint.rs
index 7cf225a1..82641a41 100644
--- a/examples/rust/cross-program-invocation/src/entrypoint.rs
+++ b/examples/rust/cross-program-invocation/src/entrypoint.rs
@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(not(feature = "no-entrypoint"))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
diff --git a/examples/rust/custom-heap/src/entrypoint.rs b/examples/rust/custom-heap/src/entrypoint.rs
index 172f9fc6..4f7df1a9 100644
--- a/examples/rust/custom-heap/src/entrypoint.rs
+++ b/examples/rust/custom-heap/src/entrypoint.rs
@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(not(feature = "no-entrypoint"))]
 
 use solana_program::{
     account_info::AccountInfo,
@@ -40,7 +40,7 @@ unsafe impl std::alloc::GlobalAlloc for BumpAllocator {
     }
 }
 
-#[cfg(not(test))]
+#[cfg(target_arch = "bpf")]
 #[global_allocator]
 static A: BumpAllocator = BumpAllocator;
 
diff --git a/examples/rust/logging/src/entrypoint.rs b/examples/rust/logging/src/entrypoint.rs
index 7cf225a1..82641a41 100644
--- a/examples/rust/logging/src/entrypoint.rs
+++ b/examples/rust/logging/src/entrypoint.rs
@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(not(feature = "no-entrypoint"))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
diff --git a/examples/rust/sysvar/src/entrypoint.rs b/examples/rust/sysvar/src/entrypoint.rs
index 7cf225a1..82641a41 100644
--- a/examples/rust/sysvar/src/entrypoint.rs
+++ b/examples/rust/sysvar/src/entrypoint.rs
@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(not(feature = "no-entrypoint"))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
diff --git a/examples/rust/transfer-lamports/src/entrypoint.rs b/examples/rust/transfer-lamports/src/entrypoint.rs
index 7cf225a1..82641a41 100644
--- a/examples/rust/transfer-lamports/src/entrypoint.rs
+++ b/examples/rust/transfer-lamports/src/entrypoint.rs
@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(not(feature = "no-entrypoint"))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,