Adding in other patches that we cleaned up some more today.