Fixes for docker deployment