Fixes on feedback