Switch to using forked modules, apply fixes to those