initial fixes for support Ubuntu, CentOS