Develop updates to get demos working