Fixing Build in All Platforms