VC headers, tiny modifications