re #45 addressed all remaining code analysis warnings