Some DJ source fixes