Ugly code changes to tweak jumping