Fix compiler issues for Xcode 6.1.1