Build fix and Xcode version related updates.