clean fixes for dj1.7

Hello! sorry for the long time.

Now I'm sending only useful changes.