Fixes in Make Demo