Fix gcc warning
Fix MS compiler warnings