More minor Docker build fixes.