Improve docker support