fix remaining primary templates