several fixes after actually working with the docker images