More samples fixes.