Pulled in two needed fixes.