Including support class novalidate and little fixes.