minor tweaks to return types