fix some problems with source bundle names, and make binary optional
2 files changed