More fixes on Dockerfile