fixes on samples