vardiff bug fixes