better support for future df versions in build script