Fixed up build scripts for demo app