Fixes for redhat