some more fixes for new library