Now compiles on VS