Fixe more function errors