Fix a few small analysis issues