Changed references to external libs