Fourth round of build compatibility fixes.