Minor changes related to VS compatibility