Finish demo app correction