Sample apps fixes

@markewallace - Hi Mark. Here another try.