fixes to allow churn work with the socks samples

There were a few bits and pieces missing. This allows churn be used from the samples. Not enabling it by default just yet.