Re: static analyzer run + few fixes