switch to some forks until patches are merged