Fixing platform issues.