Make some fields final which shouldn't be replaced final, so we can see what's breaking them.Signed-off-by: Ross Allan <[email protected]> (commit: 8185488)