VS dewarning, closes #24