Fixed Lib issues