fix: a few 'field could be final' warnings