Merge pull request #978 from etienne-lms/minor-build
danh-arm authored
Minor build fixes
d70a7d0c