configuration, templates fix