Fix compile errors related to changes in issue #269