Updates after merge
More fixes after merge