Some feedback fixes