Several fixes, some from RHEL assistants