Jiajie-xu: Fixed lib problems