Fixing suggestions