Docker build tweaks