Quick feedback fixes