fix demo problems