Fixing problems with embedding source code (mostly)