Fix for broken sample on the linux machines.
Fix for broken unit test on the windows build machines.