Attempt to address build problems mentioned in issue #30.