necessary corrections in all lib :/