Second round of build compatibility fixes.