Global: minor changes