Fixed libaries problems