Movement and Pickup fixes