Simplify script
Bug fix in Dockerfile