Fixes after merge all