updated several types for osx Compatibility