Some work to get ByHand working on 7.6.3