Patches b03c1b through 3f00b5