Fix libraries in 8.1 branch