Minor changes on Samples