More fixes after merge conflicts