Jumping related bugs fixed