s3k: s2w/l2w/l2m/l2s patch-up from @tbalden