Fixes after bad merging