Feature/xcode6

Xcode6 will complain about some more `$UNIX2003` symbols. Here's the fix.