Fix couple VS /analyze warnings + mark TODO for one.