More Shiro changes.