Bundle: Fixes for #1476

Fixes #1476.

*Note: ProjectHelpers are altered. It could have side-effects. Hopefully that doesn't happen!*