fixes to make scan-build happy