Various improvements to the Dockerfile