Small fixes for demo folder