Fixed vc cruft