shinano: misc fix

Change-Id: I26e99c456dd73048ca153eb2b649b377732d6fc5