Corrections for the latest build errors