Fix some return by alex