Improve bundle fixup