Changes to Dockerfiles to get docker build to complete