Changes to avoid Xcode 5.1 issues