Fix errors caught by VS