Fixes after bad merge