Fixed projects so they compile for XE2-5