Changes to get demo working