Minor Fixes to Samples