Minor fixes to get the example case running again