Vs warnings

@Pr4370r14n: This is a handful of minor changes to make VS warnings disappear. Can you quickly look over them to make sure I didn't do anything stupid?