Bump libs
A little bit modify code