Fixes wrt. library.