Issue #1012 - Missing Libs need to be replaced