Some more docker tweaks