Fixes in samples