Minor changes to get Poly.v to compile