Fixes for RHEL3