Extent fixes