Fix and clean-up Dockerfiles