Fixes to the sample app