fixed issues identified in examples