Temporary tweaks to build with 7.1