fixing more incompatibilities with new library