Fixed: Fixed some platform issues.