Fixed compilation errors
Merge pull request #905 from thongsav-usgs/master

Fixed compilation errors