more pre-8.0 fixes