adjustments to fix examples after merge