Bug fix, and switch to forked gems