Fix PR changes