[Samples] Fixed and enhaced some samples