Fixed compilation issues / warnings for Xcode 6.1.1