Fixed some external library issues.