s: minor stuff