Migrated to XE 4.4.1
Some minor fixes