Finish fixing demo app