clean fixes for dj1.7