fixing up mast templates