Minor fixes based on warnings from /w4 compile