(Temporarily) switch to my own fork with working fixes