Fix up handling of the first few sectors