More updates for platform, a few fixes.