Further work on sample. 
Fixup linux make.