several fixes to Docker file