[Core] Fixed OSX support;