More DJ source fixes