Fix for analyzer warnings