adapt all to lib.util.$