Fix dj1.7 issues