Random docker fixes