fix up forms