Additional and hopefully last changes to Dockerfile