Fixes for Docker deployment