Contouring fixes

Bah humbug I say