some fixes for app demo