Fix Demo app