Fix small static analyzer issues