fixed compiler errors w/Xcode 6