Several workarounds to make code compile with latest versions of libraries
4 files changed