Fixes for Sparc build.

9 files changed