changes to build from 7.6 sources