Fix and clean up examples