Makefile fix
Demo project fixes