More fixes to dockerfile.