More sample tweaks