Fix some source resolver bugs.