Fixed some issues found when using another SourceBinder