Added missing final modifiers

Tried to restore as many final modifiers as possible.