Tweaks to fix build errors.