VS compat changes

Pull this!