minor tweaks to remove warnings