Past due changes by Bret

I might role these back. Thank you for all your hard work Jianyin! It
really was a lot!