Minor changes in demo project