more 6998 fixes