Fixes by templates