[Core] Fixed compilation issues with Android and OSX;