More fixes for newer libdcp.