Adjustments to get demo working