More tweaks to Docker build