More docker tweaks