fix upstream bugs