Various feedback component fixes