tweaks to fix build