Housekeeping to make it match VS.Net version