More fixes for better source map coverage