More fixes in order to work with old baseline