Some bug fixes found by quickcheck as well as Example nodes