Fix small issues for demo