Tweak handling of colvals