diff --git a/lerobot/common/envs/configs.py b/lerobot/common/envs/configs.py
index 958f25d1..fdf58174 100644
--- a/lerobot/common/envs/configs.py
+++ b/lerobot/common/envs/configs.py
@@ -202,7 +202,7 @@ class EnvWrapperConfig:
     ee_action_space_params: Optional[EEActionSpaceConfig] = None
     use_gripper: bool = False
     gripper_quantization_threshold: float | None = None
-    gripper_penalty: float = 0.0
+    gripper_penalty: float  = 0.0
     gripper_penalty_in_reward: bool = False
     open_gripper_on_reset: bool = False
 
diff --git a/lerobot/scripts/server/buffer.py b/lerobot/scripts/server/buffer.py
index 7f0b2429..2a25fc06 100644
--- a/lerobot/scripts/server/buffer.py
+++ b/lerobot/scripts/server/buffer.py
@@ -79,7 +79,7 @@ def move_transition_to_device(transition: Transition, device: str = "cpu") -> Tr
                 transition["complementary_info"][key] = val.to(device, non_blocking=non_blocking)
             elif isinstance(val, (int, float, bool)):
                 transition["complementary_info"][key] = torch.tensor(
-                    val, device=device, non_blocking=non_blocking
+                    val, device=device
                 )
             else:
                 raise ValueError(f"Unsupported type {type(val)} for complementary_info[{key}]")
diff --git a/lerobot/scripts/server/gym_manipulator.py b/lerobot/scripts/server/gym_manipulator.py
index 1c1aead3..e05cd580 100644
--- a/lerobot/scripts/server/gym_manipulator.py
+++ b/lerobot/scripts/server/gym_manipulator.py
@@ -1195,7 +1195,8 @@ def make_robot_env(cfg) -> gym.vector.VectorEnv:
         env = GripperActionWrapper(
             env=env, quantization_threshold=cfg.wrapper.gripper_quantization_threshold
         )
-        env = GripperPenaltyWrapper(env=env, penalty=cfg.wrapper.gripper_penalty, gripper_penalty_in_reward=cfg.wrapper.gripper_penalty_in_reward)
+        if cfg.wrapper.gripper_penalty is not None:
+            env = GripperPenaltyWrapper(env=env, penalty=cfg.wrapper.gripper_penalty, gripper_penalty_in_reward=cfg.wrapper.gripper_penalty_in_reward)
 
     if cfg.wrapper.ee_action_space_params is not None:
         env = EEActionWrapper(