my fixes after merge w/ upstream