Fixed return errors