fixed compilation errors
Merge pull request #831 from jet47:fix-build