Improve docker handling.