Fix other libs as well