Some changes to the libs to remove the warnings
Will have to live with the warnings for now