Fixes #337 - adds a number of sane changes to allow the first examples to be run