Fixed several bugs with the Demo Project