-s: fix some issues