More fixes to work with new byte_to_sector structure