Some fixes for demo app