Fix some 7.6 issues