They were exactly the two changes I used on my checkout, but I thought they were hacks rather than the official way to deal with the issue!
