Fixes to make Conns run in VS