Removed ShortJump flag in places where it was wrong.