Fixes after automerge