Update to use my fixed fork