Fixing bad table format
[#2404] Tweaks to new bundle installation