Red Hat features: fixes after review