Fix #682: Use new source map syntax
Merge pull request #686 from gzm0/various-fixes

Fix #682: Use new source map syntax