Merge "Fixes for docker"