Fixes on advanced feedback.