Fix build errors
Merge pull request #728 from rmansoor/master

Fix build errors