Fix issues that kept some of the examples from actually working. PR: 144534 Submitted by: Nicolas Edel MFC after: 1 week