Fix some bugs in source requests