Docker fixes