fixing several issues with docker env