Fixes for feedback.