use our own branch that includes various requried fixes