Samples fixes