Fixes yet more function errors