Fixes for Release 2.1.8

[K.Bertram]

Hi all,

with the [Bug 37170] I attached a patch for the errors at samples.
I think for Release it should be committ.

Klaus