Few more missing `final`s here and we should be good :)