Minor adjustments on demo version code