Removed some platform bugs