cleanup fixes tested on win32 compiler

Signed-off-by: Dan Zhang <emaildanzhang@gmail.com>
1 file changed