SourceContext fixes