Fixes for building in SL6. No functional changes.