s390 fixes (8/12).

Remove this topic?

Refresh