New fixes to form