More fixes to dockerfiles