Fixes for feedback