Yet more tweaks to fix build errors

Yet more tweaks to fix build errors.