More build fixes.
Merge pull request #31 from bhewett/master

More build fixes.