Small changes to match demo project.