Some docker fixes