minor tweaks to get scan-build on overview