replaced types fixes