Fixed Libraries and namespaces