Changes made to fix bugs introduced by Xcode6-Beta7.