Applied fixes that Michele listed in PivotalTracker