MFC: r284929
Fix issues that kept some of the examples from actually working.
PR: 144534 Submitted by: Nicolas Edel Approved by: re (gjb)