Switch to fork with a couple of fixes