Switch over some modules to my fork

I have some bugfix forks that have not been accepted.
Switch to them until they get some love.