PR feedback fixes