Fixes in s-ya