various fixes to support deployment on rhel