update to address cpuarch and cast issues for xcode 6