PR 2: Hopeful fixes & Merging