Fix some more static analyzer findings