Fix compile errors.
Merge pull request #1 from FranklinChen/fix

Fix compile errors.