More fixes about %w literal