Improved library loading.