Yet more delphi 2010 fixes