Third round of build compatibility fixes.