Fixes declarations that should be final

kpmartin