Final-ify some things