Made changes as recommended by Xcode 5