Adapt to 3065 build