Modification to remove warnings in XE5

Modification to remove warnings in XE5