Fixes related to `createSrc` key

See individual commits for details.