some fixes on demo