Compile fixes.
Merge pull request #1 from ashleighpook/master

Compile fixes.