[Core] Fixed OSX Support;