more fixes around ADD for build image