Minor enhancements to the sample project