fixing analyzer issues