Some fixes in sample.