Various changes to get demo app working.