Fixes for Delphi XE2 Update 4 HotFic 1