Fixes to SourceRange