Minor demo improvements.