Fixes demo some more.