Fix other libraries as well