More MBR fixups...