issue #13 - some fixes to get all examples working again