More fixes after merge