Fixed some minor discrepancies when creating demo mode