Example fixes - addresses issues for 0.8.0 examples in #2425 

Example fixes - addresses issues for 0.8.0 examples in #2425