Update for changes in OS code