Minor demo improvements