Bugfixes to Samples