Review feedback fixes