[3.5.x] Fixes for HP-UX.