Fixes as per PR #26