Fixed issues for centos/redhat (one unitest still fails but that is not critical)