fixes and fine tuning for redhat