Fixes for DirectBuild Migration