various samples fixes