More minor tweaks to fix build errors

More minor tweaks to fix build errors.