A few late breaking sample changes

It looks like these changes didn't make it on my first try, they were trapped in another branch.