Updated to contour 2.2.0.beta2 and pg 0.17.0