fixup - analyzer warnings