sample apps fixes