Various small tweaks to example app