mark relevant fields as final
fixes from static analysis