Fixes after merge errors