Minor fixes for RHEL6