Cleanup and fix examples