NavigateOnGrid fixes. thx Daxten