some fixes for docker, still a little to go