Minor Docker refactorings