Fixes for Docker