Fix build related to changes from pull request #115

Two commits to fix build.