Some fixes after merge