Fixes for CentOS based devenv builds