Fix issues where character would get stuck