Minor demo polish