Fix PR feedback