Fix feedback stuff