Some work on getting the split build to work