Bundle: Fixes for #1476.