more final methods fix

more final methods fix