redhat portability fixes