More 9.4 issues