Fixes some templates