Demo project fixes