fixes and updates for docker in docker