Bugfixes, all examples now verify (issue #628)