Small adjustments to demo app