Merge pull request #592 from micmac1/kam-build-fixes