(i) More SourceContext fixes (ii) Bug fix for profiling