Fixes for docker