Small fixes after merge