source fixes