fixing several issues with docker env

+1