Fix incompatibilities

To work with recent lib changes