s: minor changes and warning fixes [ci skip]