Some minor fixes for new examples