Some Docker improvements