Changes for recent releases

I had forgotten to push these back up the chain...