More Delphi fixes