made some fields final
(cherry picked from commit c9d492f)