Fix bugs introduced by the vcol light change