Bug fixs for demo app