Minor fixes to make all examples work both in dev and distro