Starting to fix examples #208