diff --git a/validator_client/src/http_api/test_utils.rs b/validator_client/src/http_api/test_utils.rs
index 23a37bbc97..fc9083ea01 100644
--- a/validator_client/src/http_api/test_utils.rs
+++ b/validator_client/src/http_api/test_utils.rs
@@ -135,6 +135,7 @@ impl ApiTester {
                 store_passwords_in_secrets_dir: false,
             },
             log,
+            sse_logging_components: None,
             slot_clock,
             _phantom: PhantomData,
         });
@@ -146,7 +147,7 @@ impl ApiTester {
         };
         let (listening_socket, server) = super::serve(ctx, server_shutdown).unwrap();
 
-        tokio::spawn(async { server.await });
+        tokio::spawn(server);
 
         let url = SensitiveUrl::parse(&format!(
             "http://{}:{}",
@@ -504,7 +505,7 @@ impl ApiTester {
         let validator = &self.client.get_lighthouse_validators().await.unwrap().data[index];
 
         self.client
-            .patch_lighthouse_validators(&validator.voting_pubkey, Some(enabled), None, None)
+            .patch_lighthouse_validators(&validator.voting_pubkey, Some(enabled), None, None, None)
             .await
             .unwrap();
 
@@ -546,7 +547,13 @@ impl ApiTester {
         let validator = &self.client.get_lighthouse_validators().await.unwrap().data[index];
 
         self.client
-            .patch_lighthouse_validators(&validator.voting_pubkey, None, Some(gas_limit), None)
+            .patch_lighthouse_validators(
+                &validator.voting_pubkey,
+                None,
+                Some(gas_limit),
+                None,
+                None,
+            )
             .await
             .unwrap();
 
@@ -573,6 +580,7 @@ impl ApiTester {
                 None,
                 None,
                 Some(builder_proposals),
+                None,
             )
             .await
             .unwrap();
diff --git a/validator_client/src/http_api/tests.rs b/validator_client/src/http_api/tests.rs
index dbb9d4d620..d310a70324 100644
--- a/validator_client/src/http_api/tests.rs
+++ b/validator_client/src/http_api/tests.rs
@@ -126,6 +126,7 @@ impl ApiTester {
             task_executor: executor,
             api_secret,
             validator_dir: Some(validator_dir.path().into()),
+            secrets_dir: Some(secrets_dir.path().into()),
             validator_store: Some(validator_store.clone()),
             graffiti_file: None,
             graffiti_flag: Some(Graffiti::default()),
@@ -135,6 +136,8 @@ impl ApiTester {
                 listen_addr: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
                 listen_port: 0,
                 allow_origin: None,
+                allow_keystore_export: true,
+                store_passwords_in_secrets_dir: false,
             },
             sse_logging_components: None,
             log,
diff --git a/validator_manager/src/common.rs b/validator_manager/src/common.rs
index cc302ea20f..7bfcc2e66d 100644
--- a/validator_manager/src/common.rs
+++ b/validator_manager/src/common.rs
@@ -135,6 +135,7 @@ impl ValidatorSpecification {
                     enabled,
                     gas_limit,
                     builder_proposals,
+                    None, // Grafitti field is not maintained between validator moves.
                 )
                 .await
                 .map_err(UploadError::PatchValidatorFailed)?;
diff --git a/validator_manager/src/lib.rs b/validator_manager/src/lib.rs
index e5033035c1..6889ee79d2 100644
--- a/validator_manager/src/lib.rs
+++ b/validator_manager/src/lib.rs
@@ -50,7 +50,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
 /// Run the account manager, returning an error if the operation did not succeed.
 pub fn run<'a, T: EthSpec>(matches: &'a ArgMatches<'a>, env: Environment<T>) -> Result<(), String> {
     let context = env.core_context();
-    let spec = context.eth2_config.spec.clone();
+    let spec = context.eth2_config.spec;
     let dump_config = clap_utils::parse_optional(matches, DUMP_CONFIGS_FLAG)?
         .map(DumpConfig::Enabled)
         .unwrap_or_else(|| DumpConfig::Disabled);