Few fixes to keep rhel operational