Fix templates for generating a dest bundle