Minor update to sample conf files and common templates