Minor changes and enhancements in examples