diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 7e1e8c754e..4cb6d9042e 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -129,7 +129,7 @@ impl PlayState for SessionState {
                 if let Ok(Some(_)) = ray.1 {
                     // Hit something!
                     (
-                        Some((cam_pos + cam_dir * (dist - 0.001)).map(|e| e.floor() as i32)),
+                        Some((cam_pos + cam_dir * (dist - 0.01)).map(|e| e.floor() as i32)),
                         Some((cam_pos + cam_dir * dist).map(|e| e.floor() as i32)),
                     )
                 } else {
diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index 6170507271..02196ee77a 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -64,7 +64,7 @@ impl Default for ControlSettings {
             jump: KeyMouse::Key(VirtualKeyCode::Space),
             sit: KeyMouse::Key(VirtualKeyCode::K),
             glide: KeyMouse::Key(VirtualKeyCode::LShift),
-            climb: KeyMouse::Key(VirtualKeyCode::Space),
+            climb: KeyMouse::Key(VirtualKeyCode::LControl),
             climb_down: KeyMouse::Key(VirtualKeyCode::LShift),
             wall_leap: KeyMouse::Mouse(MouseButton::Middle),
             mount: KeyMouse::Key(VirtualKeyCode::F),