Fix up forms