Clean up some broken stuff in examples