Update library and minor fix