Fix reported issue #43.

Issue #43 reported some changes which needed to be made. These are either due to deprecation or due to errors which were simply missed.