minor tweaks to fix build warnings