More docker changes