Fix remaining lithium-s390 issues and presubmit error