Some fixes to sample project
Further fixes to the sample project