Some fixes to the sample.