More minor docker cleanup