Demo plugin: Small fixes