Borland fixes