pull-req fixes