Cleaned up errors based on Xcode 6 update