fixes after bad merge