Fixed Some demo project issues.