Env fixes
Updates docker file