Update for platform changes