Fixed issues after Xcode 5.1
Updated after changes from Xcode 5.1