Fixes after the discussion