Fix compile errors
Merge pull request #1 from cwc/master

Fix compile errors