Samplefix

I think I have another PR pending. Let me know if you want to discuss either and I can split/reorg