Hot fixes after merge