few compatibility changes for XE4 and Mac