Fixed capture templates, housekeeping.